misc cleanups (#1235)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b02d70d55902074e0296cf9a8d81737bfaeef8b5..da33def6bd354fbfb88e4e92196608e613a60e35 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -256,7 +256,6 @@ set(HEADERS
   jeeps/gpscom.h
   jeeps/gpsdatum.h
   jeeps/gpsdevice.h
-  jeeps/gpsfmt.h
   jeeps/gpsmath.h
   jeeps/gpsmem.h
   jeeps/gpsport.h

diff --git a/garmin_gpi.cc b/garmin_gpi.cc
index 3f9a824fbacbac96e0da25f39f4e26d33eb3d9ec..a936cd373d7b514387fc6b111255fafb42cd9801 100644 (file)
--- a/garmin_gpi.cc
+++ b/garmin_gpi.cc
@@ -452,7 +452,7 @@ GarminGPIFormat::read_tag(const char* caller, const int tag, Waypoint* wpt)
 
   case 0x8000b:  /* address (street/city...) */
     (void) gbfgetint32(fin);
-  // FALLTHROUGH
+    [[fallthrough]];
   case 0xb:  /* as seen in German POI files. */
     PP;
     mask = gbfgetint16(fin); /* address fields mask */

diff --git a/tpo.h b/tpo.h
index 43a0c7e4086d7f4a9833b24f2fea9b0c94203638..ddcf9ebc99ff77fc5bbc4e55168fc5d152667255 100644 (file)
--- a/tpo.h
+++ b/tpo.h
@@ -138,7 +138,7 @@ class Tpo2Format : public Format, private TpoFormatBase
 public:
   QVector<arglist_t>* get_args() override
   {
-    return &tpo2_args;
+    return nullptr;
   }
 
   ff_type get_type() const override
@@ -165,11 +165,6 @@ public:
   {
     tpo_rd_deinit();
   }
-
-private:
-  /* Data Members */
-
-  QVector<arglist_t> tpo2_args = {};
 };
 
 class Tpo3Format : public Format, private TpoFormatBase
@@ -177,7 +172,7 @@ class Tpo3Format : public Format, private TpoFormatBase
 public:
   QVector<arglist_t>* get_args() override
   {
-    return &tpo3_args;
+    return nullptr;
   }
 
   ff_type get_type() const override
@@ -204,10 +199,5 @@ public:
   {
     tpo_rd_deinit();
   }
-
-private:
-  /* Data Members */
-
-  QVector<arglist_t> tpo3_args = {};
 };
 #endif // TPO_H_INCLUDED_

diff --git a/vecs.cc b/vecs.cc
index 42c1f4291cc53fe885d6e6fca9f037a91790f836..1a232f408954bdcf8c90261acac20871e4b8c70d 100644 (file)
--- a/vecs.cc
+++ b/vecs.cc
@@ -706,7 +706,7 @@ void Vecs::disp_vec_options(const QString& vecname, const QVector<arglist_t>* ar
 {
   if (args) {
     for (const auto& arg : *args) {
-      if (*arg.argval && arg.argval) {
+      if (arg.argval && *arg.argval) {
         printf("options: module/option=value: %s/%s=\"%s\"",
                qPrintable(vecname), qPrintable(arg.argstring), *arg.argval);
         if (case_ignore_strcmp(arg.defaultvalue, *arg.argval) == 0) {